Added awareness of constrained data