Changes to support external rest library