Some refactoring; Pooling introduced as an option. This is 0.9.0-alpha.2