Add explicit dependency on messages