FEATURE - Add some validations