Factored habitats into a separate table.