Replaced procedural library with OO interface.