Validations added and some code improved