Support for older Node versions and getting rid of the Observed