Added extensions and tests.