Add third-part utilities