save contained resources
select inline resources
small clean up
add simple extension schema