Adding more constant definitions as needed