Many updates moving towards a simpler configuration and cleaner flat-list support