Alter internals to use value-objects everywhere

[bolovsky]

We are using value objects in some places internally, and we should use it everywhere instead