New configuration dir rule and some corrections