Added regexp and date support