Refactoring Tasks and added Apt Task.