Util classes added