Refactored classes to allow dynamically generated options in the console display