Few changes in database structure