And some more testings and addition to parse