Updates and changes for new API