Extension parsing tweak