Improve time module