Reconstructing some classes and adding version identifying.