Added genre input support