Added data storage for the system entities.