enhance okcfoundation module
resolve conflict and enhance okcfoundation module