Added support of most elements