Added Functionality and Validations