[DF-4476] Using BaseTypes