Added element manager