Expand Api to allow for different format results