Adding parsing framework