changes to support REST modifications