Added static vars