Fix: Separate concerns