Added Validations

Ready to update Services