added admin option and some validations