adding POCO-s+ some refactoring