mattdrayer/rebase-20140701: Updated api to support opaque keys