Update handling of certain resources
Add gateway module resource