Make this a first class API parameter?