Started to move defaults to config class