Resolved circular require warnings