changed implementation of few utility classes