Do some proper parsing