Change retrieval of ActiveCollectionManager to be a factory instead of EJB