Started adapting to 1.1 Beta 2.