Made adding custom elements better