Updates for New API