Added support for static class vars