Main system entities added