Modified version of visionmedia/axon avoiding circular reference errors