Added utility class, to replace all the stray functions