Added more classes to support latest openpeer core changes