Combine some resources

This is now possible because attribute order is not modified from what is declared
More robust ordering
Allow management of multiple databases