Simplified some value objects