Yes, couldn't agree more. The O in SOLID should be adhered to in this case. Open for extension, closed for modification