Converted constants to static