#9 - No need for a new API