Added Tasks like in develop branch (v0.4) and still kept compatibility with v0.3 processes