Updated to use model