UPDATE: Use config instead of constants