Removed dependence on HashMap parsing int/string numbers