Only rebuild when requested