Rebuilder using new API base