changing routes lookup to be handler specific