Reorganized some stuff in InstanceBuilder