Updated API to work with new servers