Added name class getter, refactored location hashes to location objects