Fixed bug with eloquent data in tables
Changes for new Modest