updated table names and attributes