Primodia refactoring