Remove backwards compatability
Add support for 2d arrays