Updated generic Utilities