Add minimal support for Factor
Fix extensions for Factor

Fixes unit tests