Removed java maps and using enum values instead.