ComponentLoader: Make work also on browser