Updates to the handler structure based on how the extensions docs came
out