added SQL tracing
added more test coverage
added dynamic calls