Turn #add_extra_headers into MandatoryHandler
Append "Handler" to handler class names
Update Flay config