Convert all handlers to Command callbacks