Refactored the Hypath and Picopath enums; added a toMap function in each.  Then simplified code in the data access object.