Proper setup
New files from composer update