new context changes + each attribute building.

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>