Updating models to match the CAP v1.1 spec