Modified the common tools class