Extended API for issue 10