Re-add Fm support