Redesigning how entities work