Added lock files and others