Changes to Contract Class/Table structure for contract builder.