Improve description parser