Add checks for main types