Even more SOLID