Version-control friendly