replaced GenScala strings with newtypes
merge