[TASK] Add correct dimension and limit handling