Structured resolve to be more modular