Better custom dimension support