Added new handlers and security