Sending event fix
Splits dependencies into three groups