Made universal build optional