Added more statistics, modularised constraints