Fixed composition issue and improved updaters api.

Also added end to end test.