Added more constants for charting