Fixing Makefiles ; Adding CIM_CurrentTime