Update #283 - Given how the project splitup has happened, need to allow discovery to happen correctly