pod interface refactor prep