Framework upgrades, added WebAPI framework