Back to amalgamation...again
Fixed extensions not loading properly