Some changes for Storeable task
Fixed Kolmakov's remarks