Updated markup for semantics