Fix Container usage in database tables