Annotation and session improvements