Added arrays to typedefs, not sure if it will work or not