Updated to use new APIs