Added defines to static variables