EMPIREDB-362 Improved constructor finding
9 files changed