Updated URL and table names