Some changes which can enable using other model names than title and field