Moving some constants to base class
Re-doing dictionary representation