Updated Relations to use a Map