Adjusted to new REST services