Fixed: specs to confirm to new design
Changed: design: More explicity types.