Fix logs
Add property based config