REST improvements