#31 API solution: core modifications