Added Genre support.
Will need more work