Improved support for pems