Updated parser, agenda & time