Add the ability to specify the keyspace at runtime