Moved object loader code to object listener for now