Updated for the current. Might be good to consider it for the string module too in the future.