Basic database structure
Improving naming part 2