Updated with new APIs

My changes