Feature/handlers

Miscellaneous handlers improvements.