Better handling of parsing.