Merged init-extensions into other modules for clarity