LL-280 #close All new types added and should be working.