More refactoring

Added additional quote class