Fixing config setup
Adding validations to models