Add handlers and coverage