"handlers" was horribly named and should be part of core