Refactor to have an isolated nova-common equivalent