updated to work with single defintion file