New API and more efficient get logic