Refactored DB to take into account instructor