Updated common api