Add system-type checking