Updated usages in markup