Changes to allow locking of all fields