Date utils and improve base models