DEV: Add reference in data members