Replaced block subclasses with instances