Make system identifier configurable