Fix OnFrame to delegate messages properly
Integration