Fixed json unmarshalling
Fixed lifecycle synchronization issue