Split handlers out to separate classes