Add routing + some refactor to remove PG lists