Use inheritance instead of composition to avoid hacking original client class