Added support for NSDate