Refactor/apc