Latest Changes with new tables