API Re-implementation