Adapted code to use Builder 2.2 data-driven stuff.