Added several utility classes