Refactor to use changes made to generic table to support jBPM.