Add the "direct" type to some versions and did some cleaning up