Timestamps methods refactoring (w/ fix)