Keeping the api consistant