Removed dateTime specific options and added options handling.