Cleaning up marketplace-application model. Hooking up update methods