Simplify extensions structure