Added leader e mapping