Change to use Symbols instead of Strings