Make fixtures easier to extend