Improve outline parsing