Improved support in different systems