#9 Replace primitive type attribute with class to allow null value