Refactor and adjust versions