Updated build with new API