Merged in Compass framework