Revision of the cal v1 API