Object-orineted design re-implementation: simple field substitution and lookups are working well. Added some documentation about new features.