Maybe the custom keyspace should be in a separate flag?