Refactor e Versioning