Re-working specs for Component