Added support for Componentjs