Api modifications