Add Type checking,DateTime and  RegEx