Added JODA time and made Template a little bit more Object Oriented.