Removed indices_only and mimiced ESPResSo library architecture