Refactor/base