Updated to more recent lists
Normalized and consolidated
Applied database changes
Minor corrections
Added new class for storing constants