Improve description management