Updated build based on latest changes.