Added Dimension. TODO: Add decorator, fix portal.