improve common role
fill out es role