Unify the behaviour of the api.