Added TableViewController and changed methods