Adding the flexibility to pass in a user defined content view factory in...

...stead of only allowing it to use the included content-view-factory