Added controllers on eventual missing data