Improved extension system, renamed elements to components.