Added noFragment option