Added versioning and enhanced tracking