Add task ID
Remove println, use logging