Rewrite solutions for new schema