Added some validations to applications