Modifying ocpi interface
Resolve merging issue