Extend configure.sample and the relevant spec part