Reworked parsers once again