Add initial extra_specs support