Reverted back to basic share mapping to avoid dependencies