Added but did not implement new Detective object paradigm.