Added a transport factory
More factory fixes