New simpler mapping for full-load.