Added support for registering components