Updated models, added not required attributes