Added utility classes needed for project