Removed builder as not a value object