Move pseudo data into own module/service