Continued implementation of new Database design