Some refactor
Added Version