Restructurized classes in repo
Input change for ALL tables