Added tasks for future versions