Changed to use Element type