Ported AppEngine customisations
Ported basic adapter code from v1
Commenting on adapters