Relates to issue #181 - Better tracing