Add missing compositeAccount assignment
Add comments