Better markup implementation