TODO:

-- Add comment and genre field support