Made the code more extensible.
Made the code more extensible.