Changed parsing method