added a structure for validations and exceptions
resolved conflicts