Refactor list structurs