Added some extra tasks