Restructured
Fixed context' access to Add function