Change parse implementation