added support for std