Although I would implement "Add Extensions entry points supports" in a separated commit.