Adding changes to security. Removing userrole class(not used)