More rewrites updates + versioning