added more utility classes