Added array prefix, along with braces and includes