Nimisha/split base class 2948