Updated for ISO build options