updated to use new TW.ValueObjects package