Changed from Method to ComputationalMethod
Merged dictionaries with full DB schema