Final changes before Checkpoint 2
Final changes before checkpoint 2 and add missing config