Feature/rest tasks