Rework owned fields & methods