Refactor extension subsystem