Move utilities to toolkit