Sounds good. Maybe change the handler to RecordHandler, too?