Add indentation management
Add test