Tracking draft: adding classes for Location and Package; non-functional