Add tables to and rationalized the single resource views