Added code table and attribute type