-- added uniqueness-option, fixed missing trailing /