Moved keyspace back to options

Fixes #57 

I’m not sure if it’s alright to break core APIs this late in the dev cycle, so if this is not acceptable, I’ll try to work around it somehow.