Configure setup
Merge initial setup