[RL,PB] {refactoring} Simplified generic data structure