Add more static variables