Modifications for Objects to Json conversion