Handle parse / serialize raw object correctly