Added validations and aliases