Added other entities/ethnicities
refactor + cached graph data