#61 Improved controller in order to add into model more data needed for table building