Integrate 1.1 features