Some changes
Merge branch 'feature/tables_improvement' into develop