Added some missing outlets regarding #3
More to come