Merging listing demo data functionality into user helper lib...