Use the canonical API instead of the Element extensions
Update documentation