Changed registration of handlers to use container as source
Fixed