Annotating without serialization now
Adding e element to data seems to be painless
Merge branch 'master' into prob-annotation