Added component and renamed template