Feature Update: Plan Locking