Replaced JAX objects with the correct service layer objects.