adopt the event source change from rest-core