Changes for REST API continue...