modified parser to suppoert definition files + test