Simplify the extension even more