RF-model: more attributes, moved data generator to Data.scala