Added amalgamation option