Changed internal handling.
First version of unified element / canvas handling.