Added the ability to rollup