Changed to support 1.1.0