Using lookupByName instead of mapping - thanks @lvh