Added type processing to internal