Refactoring of parser ifc to improve compilation time!