Updated rewrites with default entries
Versioning