Refactoring of the EntitySupport utility class to a singleton.