Added validations in serverside