Extended model and added validations.