Migrate to Rest-Client