Little code clean-up.
Allow to load components in the demo application.