Added configuration controls
Clean up