Refactoring and preparing for kobject use heca wide