Added property validations