Added data and roles