Added more typed elements