Change api to be consistent