Fix enum name, use Dictionary to store