Fix: add properties