Added more custom tasks