All Model enhancement