Updated feature extraction/classification (now includes genre data)