Some changes due to API versionupgrade