Expanded on annotations and actions