Updated Dex parser