Modify template creation for Authority