Switch to an options hash, add doc change