Object system refactoring