Add more advanced custom elements