Feat/gh19 routes