Added locking and transactional editing