Refactor Const to support variable maximum dimensions