Added support for current