Improved the parser, update deletes old entries