Adapt spec for bazaar