Removed genericserver
Added P10 Fallback