Simplify the response / new handler issue #96