Finished cleaning up the attribute type logic. TRAD-35