Fixed the parser, added update functionality