[WIP] Use specinfra