Version added to Base model and minor fixes