Moving constants to a separate class