Added new handlers and links