Minor refactor to Oats.data
File.lock refactoring