Added locations and roles