Get rid of circular require