Use selected tables
Fix strict standarts