adding static field support