Build: Enable consolidated resolution