Updated DB Entities
Removed test code