Added nonpropogatedKeys and defaulted logically