Merge with Sugarizer handling