Added dimension support, fix configurable whitelist