Added non static variables