Refactor base for ease of use