Change namespace Attributes to ValueObjects