Revert "Removed default values"

This reverts commit 17d0c794ad5e0606fbb58c4ec935be844b05e894.