[#7] Design Change