Changed to named attributes to follow convention