added more Model code