Added support for array and static fields