Added checks for all uniform types