Added genres, more flexible node creation scheme