make USEDEFAULT and REPEAT optional features