Added genres support