Added more templetes and outlet