Improved MR support