Fixed dm tool integration