Make config properly tracked
Just playing around with validation