CON-1016 | Convert variable to static class variable