added dir & dirxml support