Object refactor