Adds support for active support 4