More changes for Background Task support