Rebuilt with directive templates