Added component loader and it's factory