Updated to latest build frameworks