added preliminary support for custom dimensions