Added support for substr