Move foreign keys to QHP (temporarily). Add benefit and deduction enumerations