Feat/ updates to endpoint + client routing