Added many-to-many and cleaned up links