Move defined constants into a separate class to fix issue with name conflict