Renamed FilterModel to TableInfoModel
Added new FilterModel
updated hbm schemas accordingly