Added Genre support.