Added support for labeling and item id
First Task draft
house keeping
Fixed loading activation
Aligned with new model and service changes