Updated to new specification. If time, change getSymbol() implementation.