Added location and shortcut entities.