Change conversion to use Angular Json