Added std-support