Add better tasks