Optimization: Changed Element handling to avoid superfluous instantiation