Implemented changes to reflected fixed parser