Switched builder variables to private