Changes for EasyRTC Module effort (v0.10.0)