Update to be consistent with DRF