Some updates in Shipment classes.
Added different way to store Location data.
Added additional column to database with shipment location.