Changed validation and messages