Added tasking and messaging