Improved Entities, completed Rewrites