Fixes #3152 - improve API for developers