Reworked so I can use mainstream consul