Added version properties and cleaned