Adding date module and the new extracted feature