Moving symbols to a different class to avaoid cyclic depen