Some other updates for starter template