Updated for latest ApiVersion; Added more comments/changed existing ones to reflect current ApiVersion