Adding support for static fields