Updated Invoice and Quote classes