Updated for new spy tasks