Added models and validation