Port Genre parsing & datatypes to new API