Moved API to a more appropriate location