Support handlers with and without context