a lot of changes to models, dataService, dataContext

looks like everything is works ok after that:)