Return appropriate models
Merge pull request #211 from bogdal/fix/shipping-address

Return appropriate models