Common utitilies modified