Continue the extensions refactor