Specs fixed to reflect new internal structures