Refactored out session object building

ComposedObjectFactories are stored separatelyy