Refactor to fix single include