Synchronize OOP code with titan core
issue