Added call-count for functions for future cleanup