refractor json to be in sync with domain object