Adding arrays to remaining controllers
Relocated TODO