Refactoring and changed version