Improved support for factors