Changes for testing new api server