Refactored...
Configuration fixes