Fix State destroy
Add Task do method
Move Descriptors instances to separate properties (type problems)
Update unit tests