Update to new framework
Fix build time calculation.