Course options no longer hardcoded