Move this logic to UserTaskManager class