Changed the symbol factory over to use constants