added core + api