Updated to support the latest changes to the 1.1 spec