ADD: moved to real database structure