Refactored Keyspace internals.