fix annotations, use new directory resource feature