Adapt elements to use live sources

Change-Id: I12afc46bad593765f3a04e73538aef5f198e5834