UPD zomg remove the ValueObject crap