Following a new class design pattern.