Adding multi-task capabilities