Fix: add missing attributes