Respect cases when provider has no gateways
Version management refactored a bit; Garbage cleaned