Refactor object lists