Start to add role entity support