New DIR helper method and dependency fixes