re-factor the input processing to accommodate better the Kindless entities