XD-2122: Use roles for security access