POC refactors