Update to new framework properly
Add stats