Code refactor, added Task Descriptors to easily create tasks.