Updating packages and classes for new shop support