Made build non platform dependent