Refactoring still in progress.
Valueobjects reimplemented using Shared STL Value Objects