Added Per-Instance settings