Fixed/Merged latest API changes.