Making into a component module