- Refactored before adding another backend