Added 2 utility classes