[FIX] Fixing parser to make it work where required with new API