Update better mapping