Properties + logger improvements