Added display and editor templates