fixed issues with Configuration