Improve Plugin API 1.11 cross platform interoperablity