Changed parsing strategy