Add dry, tableSm, sink types; fix sort