Reduced usage of global constants
2.8.18 -> 2.8.19