Added address field; removed default templates