Slight changes to API (added some optional calls)