Simplify Poco persistence/sharding scheme + some refactorings