Use project_with_code factory where necessary