Changed Constant Names
removed Record usage, and added Dictionary