Add more utils class