More squeleton + routing as annotation