Rewritten using blocks to map attribute names