Further type adjustments
Fixed package.json dependencies to allow further customization by consumers