Switching to OO model for Kiji