Change TableView to support async behaviour