Updated to support 1.1