Finished ValueObjectFactory.stg. refs #471