Added utility classes needed in project