@Kijewski this function implements an API, so you want to change the API and then all implementations, which is not intended for this PR