Other utility classes - modified few + added few