Added Constants struct, updated classes to use