Change underlying datastructure and converted existing solution to use a decorator.