Improved MF2 support