Added default-scripts block and refactored