Improved Validations and Added Credentials