- updating REST and WS handlers