Added a couple new settings for returning results