Some updates to fix support for the new jOOPL Dependency Builder tool