Use new mapper methods