Fixed enums; changed maps keys from int to string