@jirwin I think its fine here because in the update_entity is where we handle the kwargs.