Add support for storing other objects for easy access
Make usage of primary source optional