Added TimeCounter and logger moved