Addressing comments
Modifiying the structure of the database for env packages, so each env package will have it's own table