Basic tasks moved to separate files