Introducing versioning features. Refactoring.