Updated to reflect v1.1 requirements