Make rest-client dependency looser