added dynamic adding of assignments