Refctor to use Row/Element instead of Array[Index] ...