Method parsing now much better