Updated to latest RDev, converted builder to be lazy-loaded