Refactored LockFile parsing