Adding 'use-keyspace' for switching to keyspace