Annotations and small modifications