Simplify, and use extra Schema markup