Support 1.1 beta