added initial embed annotations and handling