Fix for NetworkOnMainThreadException
Update to use class instead of interface (ArrayList, HashMap instead of
List, Map)