Replaced static properties with instance ones
Replaced static properties with instance ones