Added some extra parsing.