Added locking methods