Improve tasks inter-dependency