Versioning + added _unit field