Added subject vars
Added spec for Norman.js mapping