Changed to use Initializr