Better code quality for [ task #531 ] Add a duration on tasks