I would prefer to put this in a Key class. This will also fix all enum / double / int conversion else where.